Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:54:00 +0000 (22:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:54:00 +0000 (22:54 -0700)
commit800352275bbe704775d6c93e79186dc717d71da0
treedc0f5e8379af3b839ba1bab703d225bd46ae9489
parent97d73f6dee8ef33921b896d24fcc4b87be2072b3
parentb8aff49f994759bded9c8f832658eb80dea85c5f
Merge from trunk.